tests added. all fixed