Fix problem with unit tests