Fixed old test scenarios and new ones.