Updated sample and test.