Tests refactor (renaming)