[BUGFIX] Fix unit tests