(WIP) Add acceptance tests