testing: Some minor fixes in test scenarios