Corrected tests for naming conventions