More tests and some fixes for oid-bound mode (MID-1988)