Some renaming
More tests