Code enhancements (test fixes, formatting and such).