added 7-8 new tests, restructured gcal_helper