Added acceptance tests