Modify test cases and PSR-2 formatted.
PSR-2 format & add tests