Acceptance tests optimizations