Made acceptance tests more robust