Updated and added some acceptance tests