Remove trailing whitespace
Fixed breaking unit tests
- Updated a test to that order of results doesn't matter