Updated code accordingly SensioLab test