some PSR-2 fixes, update unit tests to use new API, back to 100% coverage