Reworking test directory