Fix tests broken by pop -> get