Integration tests fixes.