All tests passing for 2.6 and legacy