add acceptance tests

fixed all matchers