Fixed unit tests - adoptions for new API
Corrections for new API tests