Fixed tests to take into account module cache