Added some acceptance tests