[WIP] integrators: tests and adjustments towards rewamped states