Removed unused code
Moved testfiles around again to make the structure of tests more sane and pretty