change tests directory structure