Added more naming tests.