changes for set sampling
only changed set_sampling tests
completed cleanup of integration tests