Merged changes in schemas test-registries app

Manual changes in schemas merge