Updating acceptance tests
Update buildsupport