Modules

Seperate sets of tests from others to prevent bleeding between tests, or to restore EVERYTHING between tests.