hmm_test issues with latest mainline