Made same changes of Will so the tests will pass