Merge in all of my testing code from trunk.