Correct some failing tests as a result of
c54c3a304ef82adc975654f699d9289b9375365c