Added some organisation tests