Some fixes to tests, now pretty close to passing other than order and part status update