Changed the order ofthings in the pom, and spock comments