Fix tests and add Statement::setClaim