Added junit tests for Activity and Event