Updated Logger; Trace Messages; Better integration testst