renames and removal of vestigal tests/mocks