Made more progress.
Fixing tests.
Fixing tests.