Added more proto testcases and fixed issues