finish comment model tests
wrote tests commenting on answers
fix merge conflicts