Fixed Broken Acceptance Tests