#4137 Fixing tests - temp remove ordering
#4137 Fix compile