Make acceptance test more discriminating