Wrote more acceptance tests
Adjusted interface