Fixed normalization of multiple choice values
Fixed and added tests for normalized values
Fixed minor typo's and forgotten variables