I don't see how this part of the code say there is only the last SPA that is enable. Moreover, once we have more than one SPA I expect tests to check that they are effectively enabled. So I do not see how this is a problem for now.

My intent here was to reduce as much as possible code dealing with the fact we have one SPA only.