Fixed all unittests except fk_reference_opts....