Fix ordering of tests for faves and comments in Image()