tests for nick
Merge https://github.com/cs371p-fall-2013/cs371p-collatz-tests