Added roboelectric
Improved analytics tracking