Start adding acceptance tests