Tidying
Make tests pass on Windows
Converted tests to JUnit 4