Further tests and updates to run SPA