Updating internal usage to not use deprecated attributes. Updating test cases to not use deprecated attributes.