Tests work again, but they fail. Should be fixed!