Align the tests properly
Rename the test functions

To better reflect what is being tested.
Simplify a test