Added cargo support
Test fixed