Better integration with integrate()
Work around ODE test