[TASK] Clean up acceptance tests