Moved a lot of old test code to src/test
Moved a lot of old test code to src/test