fix test layout requires
cleanup test-layout
Blow up test dir
Move tests next to their modules
Run all tests to confirm they work
disable extra tests
Check in new test layout