Add new diagram tests