More fixes for unit tests