Issue 1: Add acceptance tests