Tests refactor, renaming