Moved Megan's tests.

Moved Megan's tests into the new hierarchy.