Refactoring the test project to make it a little better as it's evolved a lot from the start.