More changes in prep for integration

Integration test itself now ready. Various changes, most pretty
intuitive.