Refactor participant pages for testing and improve client test