fix some typo and file compositions#test failed