adding quiz service test and refactoring stuff