Fix broken tests and issue with how logger was being passed in