Working on Device unit tests