more tests fixed
final test fixs round