More tests, fixed test scenarios