Fix tests and CompactEdit