Only use 245h for format when one doesn't already exist or it is other
Removed commented out and unnecessary tests