improve code according to student feedback during lecture
add usage of @Before and @After annotations suggested by student