Add more tests, handle more error cases for def gathering#645

VisLab merged 2 commits intohed-standard:develophed-standard/hed-python:developfrom

IanCa:dev_update_expandIanCa/hed-python:dev_update_expandCopy head branch name to clipboard