Squash me.  Save spot for updated test structure/helper methods.

Change-Id: I6785718c01dc4bced3ec9d711d4ad71dee007320