Fixed Failing Acceptance Tests