- Fix (haven't tested, but should be at least mostly fixed) FunctionsTest
- Change Order.oid to an int