JAL-2629 tidy tests, refactor hmmer node mapping slightly