Making logging in tests work + fixing null pointer in baseline