Updating some more tests and answers