renaming and test cleanup