made tests run again
Merge remote-tracking branch 'eventray/master'