Fixed up some non-PSR-4 stuff. Still a couple of tests to fix