Fix tests.
Add fixes.