mostly fixed unit tests. need to fix some of the logging so that it's predictable on line endings