Improve tests directory