Adding PHPwebstorm support
Fix maven test errors