STORM-419: Updated test so sort ordering is very explicit.