Improve testing as part of the exercises