Recent merge to master broke some FJ unit tests; all should be fixed now.