Cleanup whitespace and test location