Address @Ms2ger's comments and rename a test file