Fixed some TODOs and added unit tests for organisation
Added unit tests for user