renaming and partial fix of tests