Making acceptance tests more robust