Added @BeforeClass method and clean ups