resolve Paul's comments to refactor some names and tests