Karolis Petrauskas' patch for ODE-664 applied.
Some testcases fixed accordingly.