Cleaned up the rest of the tests based on the review discussion.