Merge "Add declarative acceptance tests"