Works better for observations without approved namings

All added more tests.