Added new acceptance tests