Refine test data
Add test case and refactoring to office_spec