Some more unit tests added.