Issue #18: Fixed unittests.