Minor fixes.
Additional tests.