More unit tests added.