Tests are now all working.