Added Acceptance Tests