fix tests to account for 653e9823d8 and work around #117