Merge "Add more tests for ViewStructure/ViewNode" into sc-dev