Refactored tests in preparation for adding some more.