Updated tests to match latest implementation
Better use of the console log