This time, I'm really going to merge my changes.  I mean it.
Add updated QA tests for real this time.