Fix test and lintings