Rewrote tests for brevity and clarity.