Add acceptance tests, pass all tests