Fixing some tests.
Merge remote-tracking branch 'origin/integration' into integration