rpl.rpl_parallel: after-merge fix

* fix the test to pass
* rearrange tests in a file to allow it to auto-merge in the future