Rearrange tests so as not to set expectations on nil
Rearrange tests so as not to set expectations on nil

fixes #835

pulibrary/pomegranate,pulibrary/pomegranate,pulibrary/pomegranate,pulibrary/pomegranate