We should pick this across for all our deprecation specs