Test feedback #166 pull request