New test
Delete todo [skip-ci]
Tests refactor