Ostf adapter fixes and unit tests updates