Fix organize method and test