Updated tests.
Merge remote-tracking branch 'origin/patch-2' into patch-1