Revert "Put the tests in the correct place and fixed some styles"

This reverts commit 2867d4f5db146f3d35a5ffc5af6ae256a7fd6b9d.