Also fix unit test to catch the similar failures Change-Id: I33092e6e89cd77d4707bb61f2877c58efc775398