Yes, it will be the default in the near future but I would need to make bigger changes in the tests, so I went this way for now