Readding the RFPS and SignalPro Test Cases