Reestructuring tests directory