Improving analytics
Improved test activity
Fixed gradle build file