2.6 is working but tests should be reformatted