cleanup and popnpush testing