Return proper results for 'test=True'
Merge pull request #12800 from eliasp/states-rdp_correct-test-support

Return proper results for 'test=True'