Removing redundant assertions and adding one test.

These are only spec refactorings, but I'm getting a good feel for how this all works by spending time in the tests.