Reformatted code, and fixed compilation of tests for enum changes.