Updated the unit tests to the new test function