NTFY-52: fix schema references and adjust test data to pass validation