Oops, fixed sample code that broke unit tests.