Refactored Fixtures and modified Acceptance Tests