Addressing more PR comments.  Fixed a test that broke when new code came in.
Addressing more PR comments.  Fixed a test that broke when new code came in.

bmedx/modulestore,bmedx/modulestore,bmedx/modulestore