Updating Most unit tests to work with new signatures