adding tests
Merge https://github.com/cs313e-fall-2014/collatz-tests