Tests completed and refactored. README updated.