Tests was refactored