Fix a lockup in the unit tests
Merge INIT() and CHECK() into a single inline function.
Run the code through emacs indent again