Improve analytics test