Improved a few testcase, more protocol level exceptions