Add a few tests from demo code