refs piwik/piwik#5940 updated tests to use new structure