Clean up the Test class a bit