Would be useful to look at even before you fix the last test probably (unless you're expecting to overhaul it)