Updating unit tests to work with new signatures