Add more tests and fix existing ones - esp for planning scenarios