use push instead of unshift (which could lead to surprising behavior)
update terms used in tests