Some tests and bug fixes for org