Fix to unit tests