TODOs for integration test