Updated and added more acceptance tests