fix all test 20141010 bugs