Fix tests and remove logs