Completed the revision of all tests to work with updated functions.