minor bug fixes, and a test for order_splitting