Clean up asserts in testing

With the switch to py.test we should take advantage of it's excellent handling of plain asserts. We don't need to use `assertEquals`, and we don't need to append `, actual` to the asserts.