format and fix potential NPE I'm seeing when running unit tests
Try and comment out some tests in UI suite to see if that helps any