Some testing still require Identifier. Will make a decision to remove or not in future.