A few bits here and there to aid writing tests