Update read-me and restructure unit tests.