Make the code more explicit, and fail the tests faster