Check for null collectionData
changed check, updated tests
Moar testing!!
Fix unrelated test that needed async

(not sure how this one got by previously!?)
Merge pull request #36 from joeybaker/pr35

Pr35