all tests passing up to 9.4