Remove unneded class
Remove whitespace for readability
refactor test suite to be more sturdy