Minor updates and comment changes.
Started refactoring tests.