changed testing structure