fixing more tests
merging conflicts