removed test2 from shaoqun branch