More PSR-2 and other style fixes
Remove old-style coverage tests
Collapse the many style tests into a few less