some renaming and more tests