Fixed unit test and deprecation messages