Some tweaks to test order form