Adding/updating some test to cover 61079312