implementation of DefaultPopQuizService
renamed test
Merge branch 'master' into solutions