Some work.
Fixing tests.