Few fixes for user-tests and org-tests