fix some test - need to review them all