Fixed typos
Acceptance tests not done yet