Adding initial organization handling and test cases.