Tweaked demo setup to include creating empty expected values