Trim test logging message
Updated handleUnknown

Output the class that had the error
Add "type" to trailer
Merge remote-tracking branch 'origin/master' into tv