SPA: improve test coverage