Made test structure make more sense