Changed testing structure