Tests refactored to be more readable