Organization delete. Fixed some tests.