Refactored test to be easier to read