extended test coverage and some renaming