Changed the spec file again to make it more DRY