Even more unit tests added