Tweaked tests
Fixed indentation
Merge remote-tracking branch 'origin/2.2'