Fix up ocudl so tests can run against it. Limited testing added