Added new acceptance tests and controller methods