Refactored specs to be easier to work with in case of failure