Fixed unit tests after 20489e8948c96982efaa95abc82d2c3aee1d38cb