Adding back in some test code changes that got accidentally blown away by a merge.