All done, plus integration test