Added @BeforeClass and @After annotations
Updated name