Fixes.
Improve tests.