Issue 3496496: Fixing additional failing tests, and removing one flaky test (will be replaced at a later date).
Closes #3496496
Merge details
assigned to @lhridley
merged