fix test
refactoring
callback fix