update answer test
update tests
Merge commit 'e90898a5b056aa56ba37e0b31d0cb8c002a07338'