Add demo instructions and tweak tests