Make refactoring of tests