Cleaning up test, and fixing readme to match