New unit tests added