added tests + modified the demo to use longer list of dropdown choices + small corrections