Refactored tests to make them more readable.