Start putting tests into common code for static helper testing.

This feels ugly, but I can't think of an alternative.