Some changes to make both test show same logs, and make easier change credentials