Fix issues with EIP unit test

The resource was not being destroyed correctly, but errors were ignored.

Change-Id: I1caa9d092f58f458bd6da46f4cba4ad027b1fd38