revert to 3.5 deleted unittests