updates to pass latest adapter spec