Actually assert in validation helper functions and minor clean up of tests
Merge pull request #31 from Nitrodist/fix_tests

Actually assert in validation helper functions and minor clean up of tests