keep up with upstream
added 2.5 tests