Initial fix.
Fix tests.