Tested assumption -- remove FIXMEs