changed tests directory structure