[ WIP ] - Logger was rebuilt, test changes in progress