Fix test registration when run with MW

Change-Id: Ib349f63707a3f2baef413c48c0756806c4e5d5df