Issue 4: Add acceptance tests