[#1349] Fix some FIXMEs in tests
[#1349] Delete some fixed #FIXME comments