[BUGFIX] Make all unit tests green