Modify office and added new tests.