Clean up some logging and tests. All works!