add TestAll
fix conflict