Tests, functionality and rename