More tests added, org creation added