fix resolve bug
format
rename tests
log success
better name
refactoring and new test