Added test cases for naming.