added some testing orginization