Updates to tests.
Minor improvements.
Adding sample to README.md