fix bugs in fixme.txt, fix tests