Started refactoring the tests to align with the new style.