Added integrator merge tests. Not passing yet.