Merge pull request #1794 from solgenomics/topic/test_fix