Added unit tests for organisation