Clean up tests

Use unittest2 asserts as they're easier on the eyes