Changes in Log Structure and Test script fixes