Sorting more RC and WDBS tests around