Renaming of tests and classes, refactoring of Tie.