Minor cleanup and tag a few more failures.
Remove hanging test exclude because I think it's a deeper issue.