Test Suite Modifications

I embeded the types to reduce the amount of pointer following that had to be done. I don't know what will happen if you create a module that embeds more than a ConsensusTester, but so far it hasn't been necessary, and might prove to never be necessary.

This is all mostly find and replace.