Update tests ('siid' is wrong now though)