SO now properly adding devices. Tests need to be cleaned out