Updates the unit tests to use the new interface