Removed duplicated choice
Refactored Quiz to use directives

TODO: tests