Refactoring of test.