Finish cleanup of initial prototype, with (dare I say?) full integration test coverage