all manners of new tests
fix one of the TODOs and add test case
Merge branch 'master' into more-tests
Merge pull request #604 from metamx/more-tests

All manners of "new" tests