More general updates

More general formatting updates and generated JUnit test stubs for the
remaing files.