Tests fix: tests need to be reflect change in API