Fix test-set and prefix ordering