Updated functional tests to contain rivtabp20 and rivtab21 requests to rivtabp20 producer