Removed semicolons
Made the tests a bit more streamlined