Changed wording of the warning and modified the tests