Added naming tests. p6 passes but p7 not.