add test for activity and effort streams
Merge remote-tracking branch 'origin/master'