started fixing tests, will move to dev to finish
Merge pull request #98 from cs3733-team4/gcal

started fixing tests, will move to dev to finish