Trim test logging message
Update handlerUnknown code

Output the class that caused the unknown issue
Added "type" to Trailer
Remove unused comments
Merge master code