Do not use  in hash tests. Added a few more tests for variant hashing
Merge branch 'develop'