Mirror tests and fixes, fix org removals to be simpler