Added acceptance tests
Implemented remaining acceptance tests