testing framework
merge conflict resolved