Fixed some SolicitationCapability-related bugs, tightened up tests for same, and added new repo methods to support both