Merge "- Fix bug 35076 - More tests, test comments"