update answer test to use bill's custom test
Merge remote-tracking branch 'upstream/master'