Merge "Correct use of Spock setup and cleanup methods (no need for @Before @After)"