Fix test failures introduced in previous commit Referencing commit 94a86acba90e24d01cd71b1bf868a4fae39ea134
2019-03-24T19:31:02