Haxe 3.1.0 fix

None of my scripts were compiling with 3.1.0.  It turned out to be a relatively minor change in the naming of our formatting macro that was the fix... weird.

I've updated the unit tests to match some formatting changes as well.  All tests passing.