UPDATED more unit tests added.