Split up the tests and got started cleaning up