Tweak MainTest assert statement
Merge remote-tracking branch: upstream/master