Fix tests and add more answers.