Updated Acceptance Tests 2 and 3