Fix device manager unit tests

Change-Id: I44048873303336b2aa1855421597ec26a7f86c28