Minor refactoring of the Test class