Resolved RfpsData.java and RfpsDataTest.java to updated refactored logic