Writing tests for 1.25
Merge tag '1.25' into estudando
1.25.estudando