Restructure officeimporter test cases + write more tests

Currently there are only two test classes and some of the methods test several aspects at the same time. It's better to decrease the granularity and have more test cases where possible.