Just moved tests so that they're all together. Putting them in a seperate
eclipse project should allow the code to be tested before all the tests compile.