Tidied, moved test classes to test directory.