Also tests should pass again after this change