Refactor failing test

Change-Id: I30afc43d477977003a8297018eac6e55c4d85b9b