Adding more acceptance tests