Build everything possible in the serve constructor
Rename test_fix to test-fix
fix-mapc-int