Merge "Updated/added include/template tests to reflect Parsoid support."