fix broken unit tests by avoid triggering deprecated behaviour (unless intended)

this also includes the fixes in #1123, #1124 and #1125 which are required to make all tests pass