Started working on acceptance tests