Tweaked tests.
Merge origin/master