Clean up F-unit assembly and tests.