Cleaning tests
Weird test placement issue. Need to look at this later: