tests added and fixed.