Feature/rework analytics tests #9

Closed akiessling closed 5 years ago