Removed the trailing spaces; added teardown methods where they were missing