reformat
fix typo
more unit test fixes for JDK 7