Renamed some tests and functions for clarity and consistency.