Remove Logging, Fix Test