Update features core spock tests to improve execution times