Fix failing tests - related to startup entry log