making survey tests use the same structure as others, with separated test suits for full and partial tests