modify tests files structure