- more unit tests added