Fix some tests (and a comment)