Fixed some bugs in Office
Update test of AccountHandlerTest
Merge origin/master