Passing all tests! Except 2 Gesiler fix