More unit tests added