Fix some outdated tests, disable one that depends on OSATE2 bugs