Fixes of data/tests for RE and SJ