Refactored IR, all tests now run except fmrdd (currently disabled)