Fixes the tests and cleans the whitespace in the last PR