Some work on proper nouns, restructuring noun tests