Fixed Unit Test
Ran PSR-2 format on the whole package.