tests - simplify directory struture