Writing tests for 1.18
Merge tag '1.18' into estudando
Estudando 1.18