Add tests, fix advice plugin manager & fix PSR2