More unittest refactoring