Till section 3.25
Simplify ex 3.25

And add a test for it.
Add exercise 3.26