Add Tokens class and TestResults class. Tokens and Difference both inherit from TestResults.
Small bug fixes and conforming to changes
Add comments