Test for options and tracking in ga and universal
Merge changes