Added Log_Activity and tests