Perhaps. I think I will do this and when this gets merged in I will change it in other tests.