* initial fix * changelog * fix * fix test and add test coverage * remove useless escape characters * pr comments add more test coverage