all fixed
tests added and some fixes