Fix two 1.9 unit tests