Merge "Add mounted mode image tests and remove some image tests for OneGrid" into main