Updated test cases to use @Before