Test new code.
Improve tests coverage.