Updated formats & tests
Updated constants and a few other things