Removing some unnecessary getName() methods and tests