Tidy up tests.
Handle multiple hosnums per patient somewhat gracefully.