Make tests to pass with 1.9.3