more test fixes
fix previous order tests
fix remaining tests