Fix failing tests/code
Merge remote-tracking branch 'chiiph/bug/fix_tests' into develop