Some fixes for ostf tests

Change-Id: I992f30e14ff1edfdb02b8dddf16675870a073a6a