More unit-tests added.