improve tests
impove tests