Updating tests to work with logger changes and timing issues