Fix eval_but_ignore and add unit test

Change-Id: Ibb180528bf7496027b263ad59db5675129e2c0d8