implement store/restore comments and new tests