Also fix the tests whilst I'm here