fix orders, more test
fix orders, more test