Rewrote the tests to be more informative.