Fixed failing tests since mix-it/linkit#305
Merge pull request #308 from clacote/fix/failing-tests-since-305

Fixed failing tests since mix-it/linkit#305