add 3.5 task and fix test