Fix #41 : Wrapped companions

Fix trackingEvents issue when parsing wrapped companions.
Add some test cases for parser.