Completed 3.5 support and legacy tests