Updating demo forms to test a little better.