IN-555 Update tests to reflect c311775