Minor changes to tests and psi services