Unit test fixes
Merge remote-tracking branch 'origin/2.0.0-alpha' into 2.0.0-alpha