Fixed tracking and reporting in integrator test.
Major updates to custom integrator testing.