Some unit tests added
