Add test for validation with extra answers, remove todos as necessary