Change ordering heuristic.

Add a test_data