tests fixed
merge