Test: Workaround for ODL scenarios