Split out and speed up producer tests
Split up and speed up producer based integration tests
Finish breaking out integration tests