Fix bug in device discovery test when rest calls fail
Add spaces in string between some string concats