Add integration and acceptance tests