Fix test & add some more comments