Only testGetSlotDiffRenderer() requires integration Clean up the code that is being moved, and fix the remaining covers in the integration test Change-Id: Ic5926b23daf6738c44d9a5aacb75276f81c51f7a