fix for unit and integration tests