fix age for comment and fix some unit tests