try to fix the test scenarios