finxing #397
finxing comment reply
fixed #397
fixing test
fix test
fix test
fix #402
fix #403
reformat