Using consistent argument order.

Previously the tests used a mixed of `assert*(expected, actual)` and `assert*(actual, expected)`,
this change does the following:

- Converts it to consistently use `assert*(expected, actual)`, following junit standard practices.
- Removed the custom static methods that wrapped a few of the junit calls.
- Swapped out `assertEquals(null, *)` for `assertNull(*)`