Fixed reloading of comments and the broken tests for it.