Refactor orgTest