Refactored tests to be a little more clear.