Fixing broken tests for 1.9.3