Tests refactor finished