Little debugging.
Fixing tests.