removing whitespace and fixing tests