Update tests & comments