Remove unused import
Convert InfosetTest to a matrix test
Add a TODO item
Fix build failure