Unit test BeforeClass corrections