Added more acceptance tests