Added new tests, remove empty spaces, remove unnecessary variable