Update later parts of toolchain, update integration tests

[gtfierro]

Consolidate, integrate and clean are now mostly done. There's some sprucing up of the old code, but the integration tests should work end-to-end now -- finally!