++: overall formatting somewhat matching previous
++: fix enums
~: new tests
~: new tests
old test data fixed