Clean up wrapLinks for blaze, clean up test syntax now that include works, and add a new wrapLinks test.