Cleaned up tests to match author's.