Merge "Enhance keymaster tests"