Reinstate single patient view
Fix tests
Reinstate search view