The test suite should be: - Changed to our usual style (`it` rather than `test` etc) - Updated to include coverage for new code, and remove old unused code