Improved logging, updated TLV test case