more updates to link contracts and unit tests