Update tests
Fix PHPDocs & source formatting