Improved tested code of Sdk class