added TestCollatz and updated acceptance tests
Merge branch 'master' of https://github.com/cs373-spring-2014/collatz-tests