Refactoring of unittests.