Cleanup

* Unify the way we log by having a single log instance we pass around
* Simplify test command
* remove extra debugging lines that weren't helpful