Dhm/import split test

@cpennington @doctoryes Please review

This is the set of changes which testing the split_test module highlighted.
I had poorly merged the PRs and lost the new default_modulestore method which was later in the file. idk why the tests didn't fail before.