Proto test-cases and fix.