Test: Refactor to use @Before/@After