this change will involve modifying all the  tests.
If you are ok with it I would like to do it in a separate pull