KRACOEUS-7022: Fix tests

This is a fix for all the tests that broke from PR #63