More testing and spock notes