Add tests (and fix code) to handle package-less proto files