testing
tests fixed
merge and unskip tests