Merge "Revert "Making sure that test go to FixedLandscape on landscape"" into main