Removed tests that don't matter, fixed some whitespace