PSR-2 and a few test fixes.