Someday, get the tests to not hang on 1.8