Make unit test more flexible
Merge branch 'master' of https://github.com/gmatteo/pymatgen