Get rid of extraneous define.
Update README and some test_define2