Merge "Add parsoid-specific image testing"