Reworked test directory