Fixed failing tests with devkit 3.5.1