Cleaned up some more test method renames
Deleted obsolete helper class