Backporting production changes / updating tests