Logging improvements, test data change