Fixes to tests. Logging turned off.