fix various failing tests (and some behaviours too
more test fixes