fix unittests and add FIXMEs