Merge tests

linter is not fixed yet