A couple more HMC tests + bugfixes.