Tidy up
Removed dependency on Okeydoke because its formatting model did not fit Pearlfish's needs.
Removed TestSpecificFormat, thanks to advice from Jed Wesley-Smith.