[BUGFIX] Fix failing unit tests