checkpoint new, but broken, test
fix broken test
clean up
add some spock tests
Merge pull request #8 from grumpycats/t1650

T1650