refactoring NeoAR modele and test