fixing tests, some renaming