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

this also includes the fixes in #1123, #1124 and #1127 which are required to make all tests pass
The problem with it I have is that it seems to do some magic behind the scenes, but it is needed, but I don't know why.
the method name is also very non descriptive.