another fix for unit tests