PSR tweaks and some minor Unit Test changes.