Changes in test functions to add support to new tests