Major refactoring of our test classes