Fix broken test and add some xml comments