Refactor test scenarios..