update unit and acceptance tests
waitFor functions