Updated the tests and test styles