Fix missed paths and modules by tests dir refactor

For some reason was missed a path fix and a cli test module when refactoring the tests directory.