Some unit tests added.