Minor update & 1 more test