fc-daemon and test fixes