Attempting to demonstrate and resolve #711
Fixing the referenced Integration test as well