Correct tests

Since devices are not being returned, we need to consider that in new
tests. Also a couple of config was missing.