Added tests for resolving and applied PHP-CS-Fixer