Update
Another Update

Small bug fix in log, just got rid of the null because it was causing an
issue in the test I have. All the other stuff is just me fleshing out
the tests.
Merging latest updates from Bryan's testcases.
Test mostly integrated in with refactoring changes made today now.