Rename tests and testclasses for consistency.