some refactor
remove unusefull tests