fix tests and complete renaming things