Minor cleanup and abstracted test process builders a bit.