Fixed some FF unit test issues.