(PDB-457) More storeconfig acceptance test fixes

Found an if block preventing storeconfig acceptance tests from running. Removed
that and made some other minor test fixed.
Merge pull request #924 from senior/maint/master/more-storeconfig-acceptance-test-fixes

(PDB-457) More storeconfig acceptance test fixes