Fixing tests and using spaces, not tabs