Convert tests to use mock modulestore