Fixes for failing fitting tests