Removed placeholder tests
Whitespace
Fixed errors in tests due to split into different files