Added 2 more acceptance tests/