Missing unit tests added