CHANGED: tests directories structure