improve test. replace zapping -> pop_push