Add RfACRFactory class (+fixes)
Additional UTs and add ACR checking to UTs