Format the file.
Unit tests can now be callapsed.
Adjust the demo so that the demo/test code is properly presented.