Unit tests. Fixes.