More tests.
Fixes.