MEDIUM / Removed deprecated FIB and update unit tests