Cleanup a little bit better after tests. Move Ignored annotation to be more visible in JUnit