Changed up testing structure