reorganize tests directory