Make comment integration tests green