[TASK] Test refactoring