Fix some failing tests. Use unittest2.