order test fails with null pointer
null pointer fix
problem fix
merge with order-test