Add option to use RR_NC or not
Functional tests cleaned up. Tests for rr_nc / full system