Renaming and more tests