Updated spec and chain query expectations