removed unused tests
Additional renaming