More PSR-2 and other style fixes
Remove old-style coverage tests