fixed all the tests and string whitespace issue