Clean up errant logs and extra code
Add logging and tweak tests to debug