Small fixes to modulestore test refactoring