rename test file and minor comsmetic fix