Update manage spot service + tests