Fix up tests.
Major update to README.