simple renaming and more tests