SOlved all bugs in acceptance tests.