Fixes for failing tests