fix for failing tests, to update to code changes