Fix some more tests
Merge remote-tracking branch 'chiiph/bug/fix_more_tests' into develop