Fix broken unit tests due to last commit