cleaned up logging, re-enabled disabled tests