Simple fix for failing tests