resolve tests
merge master