model test
some refactor
fogot add